Merge changes from emacs-23 branch
authorChong Yidong <cyd@gnu.org>
Mon, 9 Jan 2012 05:48:13 +0000 (13:48 +0800)
committerChong Yidong <cyd@gnu.org>
Mon, 9 Jan 2012 05:48:13 +0000 (13:48 +0800)
commit91a12011a92027b817111780534cded61ff76f03
tree20860de411c81f4e4c7ab5a5d0995821898ecfb7
parent9b8b339ea87dece178975438bfdcc558b36bc038
parent827d0ee694ec36ffefb6894a811d0f20321c104a
Merge changes from emacs-23 branch